Merge "Clear native shader when Paint shader changes" into oc-dev
am: d3e78478aa

Change-Id: I8d9c87e232ee1bbc77f3c5618f5856e891c78a74