Merge "Move test_mainline_modules to AndroidTest.xml"