Updated to build-tools 0.3.6