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