Merge "Merge "Merge changes from topic "am-2254ff447075487bbb30ffe7d147ba6a" into cw-f-dev am: f506e7d027" into nyc-mr2-dev am: 5e9322cb9d" into oc-dev am: af94a3c732
am: dbf6877281

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