Merge "Convert to Android.bp; rename libminijail_vendor"