Merge "Remove test logic from Android.run-test.mk"