Merge "[RenderScript] better handle edge cases for Incremental Intrinsic Support." into mnc-dev