This reverts commit 73fe13c9. Reason for revert: b/293884796, crash on boot of riscv64 aosp phone. Change-Id: Ie90e0e99ddaa7bb5d496e2b1d0ab0302702cb2bc