am 3f857b78: Merge change I32d41651 into eclair

Merge commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc' into eclair-plus-aosp

* commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc':
  Allow a GLThread to release and reacquire the EGL Surface as needed.