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

Change-Id: Ia98e539dd09dc4c2f28f0129e442fca721252aa2