Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 93d7facd1b

Change-Id: Idc2f73a13852597650fde6a00198450154a2ca7e
tree: 28b3c4bb75a92b78fa96e3d05e5b90cad0a590e0
  1. java/
  2. test/
  3. Android.bp
  4. copy.bara.sky
  5. manifest.txt
  6. OWNERS