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 am: 0a2ac837d1  -s ours am: 415ec85fdb  -s ours
am: 5c47b5ec06  -s ours

Change-Id: I3a438d3b5945da3fbcb8e6a655e53813d0094b74