Merge "libbase from latest crosvm also needs to be renamed." am: c1521b3576 am: 6d459b1c10 am: 6db0f812d5

Original change: https://android-review.googlesource.com/c/platform/development/+/1396549

Change-Id: I54dad33747b5943953859f76b1da649b5c7cc523