Merge "Revert "tools: pack.py: ipq6018: Add support for NAND AC image""