Merge "Fix dependency on APK used by test"