Merge "Update Buck to recent version"