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

Change-Id: I3f78c82aeef8a3891b5d1acc3fccc5344a612296