Merge cherrypicks of [2844228, 2844486, 2844487] into studio-3.0-release

Change-Id: Ic79a3d74bd69e90699064263c753343025ab97cf
tree: c8bd752a9c37deb180c234e6218a331aa444c8cd
  1. java/
  2. Android.mk
  3. BUILD
  4. build.gradle
  5. copy.bara.sky
  6. manifest.txt
  7. OWNERS