Merge "init: switch host_init_verifier to getopt()" am: c4117afdc9
am: 5228b546aa

Change-Id: Ib7bd0d0888fd95f42c2f1cab15788c56001af525