sync to lmp-dev/bionic 1e010d60397db706cd3d1c4d5701a2bced441aa8 Change-Id: Ieed39d41eb0655d7c8f027bd038be1753a9e56a6
Change-Id: I554024e5afb7a8be44fb2884ffe369992bd0a959
See https://android-review.googlesource.com/#/c/99021/ Change-Id: I10daf2da97aa9d3c99661b5d79080b96a0ae9f22