Merge "Revert "goldfish: add script to create partitioned image""
am: 66b69c8c17

Change-Id: I6e609a632a07e9fa7e036c880cf58d50cd36ff50