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

Change-Id: I35d8fd5528e5d142e89380a64e59e7bb7c596924