Merge in cl/201712945

Changes to provide base image name for goldfish instance via command
line. It should override the value provided by the configuration.

Bug: None
Test: ./run_tests.sh
Change-Id: I418cef25bddf7fa42e93726401f206aa44e9736f
2 files changed