Merge "Convert to Android.bp; rename libminijail_vendor" am: cb47aaf493 am: 6e975b1840
am: e7175b50ed

Change-Id: I0b3df506bc33aed78742f353e6d5863f57985db5