Merge f074a0e0cc4c113bcc080e98a8741b2ac3514b7c on remote branch

Change-Id: Iae7aa9b57484ef8c182e2ed3d1ffa041c502470e
tree: b8533e5d1cc932ffbf81ea12c29f94a061af2fcd
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg