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

Change-Id: I7f1713b33311b07e7939bfcc2538b321e3242c6a