Merge "Fix bugs caused by Hwui and Skia syncing"
am: a168e370bb

Change-Id: I575b925e6b37e74de292b49fc9a1a8e050623dd0