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

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

Change-Id: I858a99971582b8b8d7002124d5690a218061832a