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

* commit '22c66639093a634b5688372d261d003b0478c450':
  Fixes for 64bit in libhwui