Merge "Revert "Convert libcore native code to Android.bp""