Merge "Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478 am: e871596f" into oc-dr1-dev-plus-aosp