Merge d2a86160d41ee77d1c9b122af8ed848c735ae38f on remote branch

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