Merge "Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25 am: 96018b3d10" into oc-dr1-dev-plus-aosp
am: 00f21a2360

Change-Id: Ib1186289e955e0b6f35285a192b2e02d8996f4ee