Merge stage-aosp-master to aosp-master - DO NOT MERGE

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