Merge "Rename android.compat.IPlatformCompat"