Revert "Revert "Follow prebuilt/API update""

This reverts commit e8f917cae73267f37c7b7333f33c487c07318f00.

Bug: 73250914
Test: make && make cts, manual testing
1 file changed