Merge "Revert "Convert libcore java to Android.bp""