Merge "Switch command to subprocess in build_image.py" am: 36e612b753
am: 82e63d3037

Change-Id: I4a241ec872093067c9792ec36a5e9f1eec8c3d9e