Merge "Fix random crash in libhwui" into mm6.0