Merge "Revert "Follow prebuilt/API update""