Merge 323d7c48ca5865f16acd6de09b2efe5acb5a5606 on remote branch

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