Merge "Don't build host_init_verifier on Android either" am: 45ee43b1ac am: 274e082328
am: 9b973fe995

Change-Id: Ie20d27796eec124c4cf374ee67095c48afe35d45