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

Change-Id: I7f540db251e56713da39cae7ade3c13dd1e2a078