shamu: Update extraction scripts

Change-Id: Ia7366d77b0ac4d03ec1c0c7c2c82f60ab728ad32
Merge "shamu: Update extraction scripts" into lollipop