Merge "Fix RenderScript crash." into klp-dev