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

Change-Id: I0c3e956bcabdc157b44c417acab6aea221f19a39