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

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