[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: dc669cdcf3 -s ours
am skip reason: subject contains skip directive

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