Merge remote-tracking branch 'aosp/upstream-master' into master am: 0b3c15f840 am: cc9e6f50ae
am: b1838b10de

Change-Id: I65df3ab235d9746b787758e77937f17bd7691ccf
tree: 4287a03003b29b55dd87bd3e9d99701fcf99f34f
  1. Android.mk
  2. copy.bara.sky
  3. java/
  4. manifest.txt