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

* commit '6191044729b2dace9c9b4b15b19a8839377d8973':
  Fixes for 64bit in libhwui