Merge changes from topic "am-5755dd9bae474279bfde03edb851954a" into oc-dev
am: 66689efac3

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