Merge 176b0e75529c9ac5131148d735ce628c397e7337 on remote branch

Change-Id: I413d235e22d3fd955a74b84890da908431a52671
tree: 8fd4a1ada9a0e69d23ec2ca53a49bad50c2a45bd
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg