Merge "Revert "goldfish: add script to create partitioned image""