Upgrade libkmsxx am: 98c04ac5aa
am: 7a5025151a

Change-Id: I2223aa7921a88d91335c7c71e97efceb5ffc4a08