Merge "Remove the env setting in AndroidTest.xml"