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

Change-Id: I9bea6eef7fa3caf0c5eb0e40811156d5cb32bb8f
tree: 16555c5e8e6421c68a77d3123983d59281328fbf
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS