Merge "Update makefiles for Android.bp Java."
am: 514cf29060

Change-Id: Ic7e90246426fe3c250c3ffb6cbf9dde845daf042