Merge "Buck: Fix api build"