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

* commit 'c37b63d6e777748d17ff177b128e30504fbd6c71':
  Ensure that a canvas is always backed by some form of SkDevice.