Allow wait_for_image_status() to have multiple

This lets us wait for one of multiple target states so we can more
effectively avoid race conditions where we miss an intermediate state
and first poll the final one.

Change-Id: If12c35d38c03fa329ebbf536e2fcd3ff2bd136de
2 files changed