Add in test-module-name in AndroidTest.xml for some tests. am: c516d40902 am: c73f2593ca
am: 6cb8201528

Change-Id: I7ac09789b2d374ac251f1c5b8e1282be877a92fb