am e7bdf2d9: Merge "Don\'t crash on Canvas.drawPicture()"

* commit 'e7bdf2d9d0107afadddb6498331cd21be260d23c':
  Don't crash on Canvas.drawPicture()