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

* commit '240d56386377f3bcd554a2cc07e0c3e336103c86':
  Fix 64 bit compile failures in renderscript