Merge "Require a vendor_ prefix for users/groups in /vendor/etc/{passwd,group}"
am: e64694118a

Change-Id: Icf52b0b4f4c683c24c59d855fd355c026e0fffc1