Merge changes from topic "am-8a5b86f8-be8c-4062-afcf-d631975ceb6b" into oc-dev
am: e634ca4e0e

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