Ensure that addon build hooks are called in the proper order.

/cc @rondale-sc @danmcclain