Revert "Follow prebuilt/API update"

This reverts commit 8aca4f00632959b0c9c04a893270843e561387dc.

Reason for revert: Required for prebuilt revert

Bug: 73903252
Bug: 73876473
Bug: 73875529
Bug: 73866916
Change-Id: I9be2f47458bfba97bacf34372752328c47a5ff9f
1 file changed