Merge 0ed5e7836aa51980993318926cc4010a40cba93d on remote branch

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