Merge "Include test files in Android.bp"