[CLEANUP] - Review build scripts
* Fix the fix.
Merge pull request #154 from dcleao/CLEANUP

[CLEANUP] - Review build scripts