Merge "qca: tools: Modified pack.py to support new single-image package"