Merge "Fix random crash in libhwui" am: 3f67a1855e am: 9aaf189103
am: b4e6b8a3df

Change-Id: I94df288a017e27aa86b80a5b4a0bf355947cabfb