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

Change-Id: I17c40dc6daa30097bf376617cb91fff65f87fa45