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

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

Change-Id: Icf8f6f85671b754b0f800b1d9b56a1cf3d59ec54