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

Change-Id: Icc071aff2d83a4eaacd8ec39849f03c8a1966bdc