Merge "Add androidTest to test folder names." am: 35b0cafbc2
am: 5f503e25b8

Change-Id: I4b79c4ff1ae7b26e8fdc654c0311d70d7b782514