am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"

* commit '7942397b3174a9642996979ae8b4aafb313dc2e2':
  Fixes for 64bit in libhwui