Merge "Modifications to test_defs.xml for AndroidTests files move."