Merge "hwui: fix possible null pointer de-refrence"