Merge changes from topic "am-492ad0fb-402d-4977-be93-b82e053bee6f" into oc-dev
am: 152634b8b6

Change-Id: If6b3edbab11b3ccbe30cde4a07ac20c21eddf7a3
tree: 7aebd849ad6e2d370166662a8ffc56d6b7090ce5
  1. common/
  2. decoder/
  3. test/
  4. Android.bp
  5. MODULE_LICENSE_APACHE2
  6. NOTICE