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

* commit '192563407964926537d688d4098054c3834341c0':
  Fixes for 64bit in libhwui