Merge changes from topic "am-4303668227b54beb9c1e82d37d8a8d4c" into oc-dev
am: 3216dd21b4

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