Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 1e3790f31d

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