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

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

Change-Id: I047cbd6f69158e1af9b1f40aec273b940d01d0cd