am 9b565d5b: am cef8d031: Merge change I00d0b54a into eclair

Merge commit '9b565d5bf38e77774956524f137d509471ae5fb2' into eclair-mr2-plus-aosp

* commit '9b565d5bf38e77774956524f137d509471ae5fb2':
  surfaceflinger: remove un-cached buffer hack for SGX