Merge "libminijail_vendor is now just libminijail" am: 16f2c1559c am: 9e6949855f
am: 8eef134245

Change-Id: Ie524228f0ec896f7d884112a76c6a2f3075ce8ca