Merge "Remove the env setting in AndroidTest.xml"
am: 709beee5d7

Change-Id: I5497dd617a80a7f06e07319f2dd46d093510b6e0