Shamu: Update for extract-files changes

Change-Id: I432a561c3f2ac1359c1c51ee3dafcd720f2fe63b