Merge "Convert libcore/ojluni/Android.mk to .bp"
am: 1374342fcd

Change-Id: I760108228fcf660ed1b5961a9d5ce8b5276bf916