Merge "Revert "Use java prebuilts""