Merge "Rewrite fsverity_init in C++ and load keys from keystore" am: a28f0d8c63
am: 158361d164

Change-Id: Ia325ad938f9c787b61e6f915e1ed410140fc1b9b