Merge "Clean RenderScript warnings" into mnc-dev