Merge commit '20208ff643b33956c93d1f3fa1fa2c2d06fc7d02' * commit '20208ff643b33956c93d1f3fa1fa2c2d06fc7d02': surfaceflinger: remove un-cached buffer hack for SGX
Merge commit '20208ff643b33956c93d1f3fa1fa2c2d06fc7d02' * commit '20208ff643b33956c93d1f3fa1fa2c2d06fc7d02': surfaceflinger: remove un-cached buffer hack for SGX