Merge "SkTArray to move when moving." into master-skia

https://skia.googlesource.com/skia/+/918090c819109585f8fd2295039385a60eb0b572

Change-Id: I34f947215ed57afdd43863115e470209cf163187