am 8ab6679c: Merge "Ensure SkCanvas will have a device by default." into jb-mr1-dev

* commit '8ab6679ce80dafa0d97c426c9fe70c6b6ceb20e6':
  Ensure SkCanvas will have a device by default.