Merge "Fix issue with Android.run-test.mk"