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

Change-Id: I0137a37ab05e52410bc2db65123bffeebaacffa3