Merge "Move fsverity_init to after class_start core" am: 9a7e1eff5a am: 651703706f
am: d5aaf571b7

Change-Id: Ic8436e99910131350d686eef700583fa2e81ab4d