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

Change-Id: I7709f22fca7e1f0966fe3548778a0506240690de