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

Change-Id: I7b4ffd3eb5ce4e4dd191cf266b2c53d0128f4990