Merge "Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa am: e871596f15" into oc-dr1-dev-plus-aosp
am: 70329318de

Change-Id: I4b49d917620b0659605866063478fd24aa285ba7