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

Change-Id: Ib0c0a531e09f15db49fcf0931b0a92d97964a642