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

* commit '4f346bf0ffe1c596ca261dfec23c50977de77d82':
  Fix 64 bit compile failures in renderscript