Ensure that addon build hooks are called in the proper order.
Merge pull request #2792 from rwjblue/pre-build-duh

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