Merge "Convert android-support-test to Android.bp"