Merge "Update host build for libhwui" into main