Merge "Update makefiles for Android.bp Java."