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

Change-Id: Ie998feed3673a1464862a579c2adb3d382d2c026