am 8880093f: Merge change 24493 into eclair

Merge commit '8880093fe386ab0dcefec9ce41f8ce6f4e068b0e' into eclair-plus-aosp

* commit '8880093fe386ab0dcefec9ce41f8ce6f4e068b0e':
  Fix several issues in framebuffer_service