am 6b4f28a7: am a53e955a: Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-master

* commit '6b4f28a7930c115f4b9e0d4fdfcd41b3bb58bf58':
  libgui: Plumb attach/detach through Surface