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

Change-Id: Id30081863fc467acb09bcc087596e3ec43aa3528