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

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

Change-Id: Ib57b16ea017e4917ece378650a58a5655988e2ab