Merge changes I27fa4dd6,I5bd8c2d2 am: a132c70bdd am: b588547f97 am: 464d379578

Original change: https://android-review.googlesource.com/c/platform/external/libwebsockets/+/1672329

Change-Id: Ia520c59a849798ede99060aad905f03abcc75bac