am 3866899a: Fix http://b/2326879 (drawing glitches)

Merge commit '3866899a033d0cef4d168df93e0d1f65837dfe9e' into eclair-plus-aosp

* commit '3866899a033d0cef4d168df93e0d1f65837dfe9e':
  Fix http://b/2326879 (drawing glitches)