Merge "Fix RenderScript warning." into mnc-dev