am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence"

* commit '5e7ef9489f3247c02395202d88fb4fb425aa8412':
  hwui: fix possible null pointer de-refrence