Merge "Fix build issues with external patch."