Merge "Update structure for the build-tools/plat-tools." into mnc-dev