Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3  -s ours am: 3f39609cff  -s ours am: fb4beac069  -s ours
am: 18305d920e  -s ours

Change-Id: I7cc54b33bc5a37f5ff7f23ba3a33cb477932eb8e