shamu: Stay inline with "vendor/moto"

Change-Id: I7d5236b6c609001fb94168fd970ad73211703d96