Merge "Revert "Revert "goldfish: add script to create partitioned image"""
am: 32082aa62a

Change-Id: I2330987e0518863478e2f8d64a5cbf11eb099df8