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

Change-Id: I8fdd38f6738345a320c842bad905559514586eb2