Merge "Revert "Revert "Follow prebuilt/API update"""