Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I0674e13bcf580439c257d1eced1ea2c780327654
tree: 5258476de0e5b2ce863c7e231ae370a097e3b93b
  1. java/
  2. Android.mk