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

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