Merge "Fix buffer overrun, bit overrun and add a test." into master-skia

https://skia.googlesource.com/skia/+/5520dede2968372e79c572e37b7f325524ee0739

Change-Id: I13384dcddff9acb26d14e5c82e6475f8e2fb833b