Update shamu based on cm.mk in dhacker's repos

Change-Id: Ia98e539dd09dc4c2f28f0129e442fca721252aa2
LRX22G

Change-Id: I8b3f99aa4f426b359a336858d61ff4ca03d1b3c3