Merge "Convert tests to Android.bp"