Merge "libhwui: make setSurface asynchronous"