Merge "Fix random crash in libhwui"
am: 3f67a1855e

Change-Id: I8dfcad3d00b2cca955457142b963934143ec2cbd