Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into oc-dev
am: 31e502e108

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