Merge "Don't run testCanReplaceLibraryIfVersionAndVersionCodeSame in instant mode"