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

Change-Id: If4bfed3a048b53197fd6a7447ce7d60c78c4c384