Merge "Fix bugs caused by Hwui and Skia syncing" am: a168e370bb am: a69712a83d am: 3b86e3c9c4
am: 9fce248a5f

Change-Id: I63015e3d0065fb17e4b0d789f6f540436965de15