shamu: Rebase blobs (AndroidOpenDevelopment version)

Change-Id: I7b40242a68741049d121c8834423ce02220781f6