Merge stage-aosp-master to aosp-master - DO NOT MERGE am: a99bb6d755 am: 4056a893c6

Change-Id: I990c32090cb7f9c6965eab3d45a98a00a268752e
tree: 587a3b49ca83cd9dc8c9c863b34cfbfeab118769
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS