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

* commit 'a53e955ad882793bb6fea00d4d110a3d8878ab57':
  libgui: Plumb attach/detach through Surface