DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d  -s ours
am: f380f53752  -s ours

Change-Id: I2b6441bfb380c443199a72ea61044a5480d93324