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

Change-Id: I8dd577d3e889dc3412e991497cdbece4300b5860