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