am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"

* commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46':
  Fix 64 bit compile failures in renderscript