Merge "Remove test logic from Android.run-test.mk"
am: d38959a206

Change-Id: I360307b17faa43aed63cf86bf787e2dae7bbd900