am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is...

am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2

Merge commit 'e7b2845d' into eclair-mr2-plus-aosp

* commit 'e7b2845d':
  DO NOT MERGE