Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev