Merge "Begin atlasing" into master-skia

https://skia.googlesource.com/skia/+/952841b

Change-Id: I9d0cd0fb2b173ad55a1abed1a29aac0b7f35f8f9