Merge "Removed hidden mutable APIs from PorterDuffColorFilter"