Merge "Make Paint/Shader/ColorFilter#getNativeInstance conditionally thread-safe"