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

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

Change-Id: I3a417ef884a0af4f9e9d2956e9194cb53a1ddb9b