Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make...

Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5d  -s ours am: 3f39609c  -s ours am: fb4beac0  -s ours am: 18305d92  -s ours am: 0a2ac837  -s ours am: 415ec85f  -s ours am: 5c47b5ec  -s ours
am: fd935853  -s ours

Change-Id: I33e0bc9875ab4b078cd79bc6c48b4b098091ace8