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

Change-Id: Id74fce2dd53d21ec6baab99b3230c905ce16eef3