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

Change-Id: Ib8b4fe81cf14b1aaffc1f3635deddbd4401c69b7