Merge "Add a script to parse an block-based ota package" am: f34d435925
am: ca3aad1943

Change-Id: If6198b0fa73406ed9820676af4395ff649aad69f