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

Change-Id: I2c4719bec490113cb3286e6790ae85ea37dd2274