Merge "Add binder cache key for PlatformCompat"