Switching keystore to C++17
am: f9e0ec3a9d

Change-Id: Ie81dcc6c378888fe91c79616d6ccb41dfb863b98