Merge changes from topic "am-cd6014504985445caaf4eb1e092e10ca" into oc-dev
am: 2b6f7368a0

Change-Id: I1b0621fdb70324a0a1c2d2f79b3c8ae74359b5c7
tree: 82d2045a7f095a0a0ee4d35c4242c5fc5eff0794
  1. common/
  2. decoder/
  3. test/
  4. Android.bp
  5. MODULE_LICENSE_APACHE2
  6. NOTICE