Merge "Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp am: 7b38914e4e" into oc-dr1-dev-plus-aosp
am: d2d0e31200

Change-Id: Iea40d864193eead68603aac150a5e02d0060728d