Merge "Fix testUsesSdk test to use higher extension version."