Merge "Allow compatibility-device-util-axt to be used with ExtendedMockito"