Merge "Update native ColorSpace API for libhwui"