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

Change-Id: I5a9384028203b807a4bd0eac2d64d91f2979704d