Merge "Revert "Use java prebuilts"" am: 4d69df5191
am: f4e78ccf25

Change-Id: I1b0bfaa059f68e09c115662ca9f850213305b8f0