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

Change-Id: Ia6597a647704cc357759283b5136fa384478545d