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

Change-Id: Ibbb6d37d5c08204c70cf03f0a7d18c9978a5c97d