Merge "Make update_prebilts.py fail gracefully on bad sdk zip" am: 3c438b3962 am: c5c89c1e95

Change-Id: I0b3e308dd7380739781ef94ca433ea9a417b8970