am 8225c5b3: am c37b63d6: Merge "Ensure that a canvas is always backed by some...
am 8225c5b3: am c37b63d6: Merge "Ensure that a canvas is always backed by some form of SkDevice." into jb-mr2-dev
* commit '8225c5b3':
Ensure that a canvas is always backed by some form of SkDevice.