Merge "Stop using unsupported Canvas operations in IME" into pi-dev
am: 0355dd6436

Change-Id: I678d7c263459664a28b4fa72ee2ef60c91fd118f