Merge "libminijail_vendor is now just libminijail"