This reverts commit ab6e524709
.
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=aosp-main&target=ndk&lkgb=10879153&lkbb=10879224&fkbb=10879224, bug b/302608661.
Change-Id: I07d47a92ea9a9f5d329e813859316decfd75cde1
BUG: 302608661