Merge "Convert core/tests/**/Android.mk file to Android.bp"