[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
am: 21c2ee6d18 -s ours
am skip reason: subject contains skip directive

Change-Id: I2a794ad4fa55ea5ab58632a2c05b0e336e0db68e
tree: 1810bd30547888def3aa2250e01aca085d5f92ac
  1. Android.bp
  2. OWNERS
  3. codec2/
  4. hooks/
  5. media/