Merge "Finish converting JavaLibrary.mk to JavaLibrary.bp"