Merge "Fix build tools packaging." into mnc-dev