Merge "Add config_setColorTransformAccelerated" into oc-dev
am: 5170533465

Change-Id: Id5c49324fd2e0acda8f2c7d365b90ab52db3abf0