Merge "Finish converting JavaLibrary.mk to JavaLibrary.bp" am: 59bd775af8
am: f9c532005e

Change-Id: Id6d52c371d3a419c0b26db356e73c402a07c0b6f