This reverts commit 88271135. Reason for revert: hwasan builds breaking Change-Id: I28094e27d5935c6f371fddddf4b6b0334de9b12c