Merge "Avoid undefined compiler behavior" am: 98115b7494

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1768648

Change-Id: Ic248dc211231afb7792bc459407b1d41efa783a9