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

Change-Id: I8e44f99a76f0dc7fd445cf26b16b724f372dd270