Merge changes I361741f8,I036b2cd1

* changes:
  Revert "SurfaceFlinger: protect state members in Layer"
  SF: Latching buffers requires holding mStateLock