Merge "Add androidTest to test folder names."