Merge "Support oem_#### users/groups for host_init_verifier"
am: fe80d069a0

Change-Id: Ie59394a402c0d8c6cb5d9a3be574ccdb6e71eacc