[automerger skipped] Merge "Make update_prebilts.py fail gracefully on bad sdk zip" am: 3c438b3962 am: c5c89c1e95 -s ours

am skip reason: Change-Id I91d6c3d6a64cfbb993295cc07ab48c9aef5d71e0 with SHA-1 a26e481a43 is in history

Change-Id: Id5e6bcb0bc569af4c2027cdd8da8540d42d7dc47