Merge 46be78475056e8024acdc1dcaf72f53acd38917a on remote branch

Change-Id: If0ab6b1494628fd664516cdd5700bcb478119d7b
tree: 25b75eb6f8866a57e23f4b4eadc8121e71e9fd60
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg