Merge a7c675601df1d791a08a31070d4791abc74dbae6 on remote branch

Change-Id: Id8010d23901bb318f88ccfe1644f51382ed2193c
tree: 25b75eb6f8866a57e23f4b4eadc8121e71e9fd60
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg