Fix merge conflict for 'c506ab89'

Conflicts:
	NOTICE

Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6

NOTICE

@@ -72,6 +72,15 @@ is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 OF ANY KIND, either express or implied; not even the implied warranty
 of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for Additional Codecs code.                           ==
+   =========================================================================
+
+Additional Codecs
+These files are Copyright 2003-2010 VisualOn, but released under
+the Apache2 License.
 
                                Apache License
                            Version 2.0, January 2004