crosvm: Fix android and gfxstream build errors
crosvm: Fix android and gfxstream build errors

BUG=b:236873276
TEST=`cargo build` in crosvm repo, `m crosvm` in android repo

Change-Id: I62cc00d10c5da0c0757821e173f3938aeb2badfb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3735632
Tested-by: kokoro <2ac7b1f3fa578934c95181d4272be0d3bca00121@google.com>
Commit-Queue: Daniel Verkamp <72bc170b46ec491f7bdd4359a1c0bfed274de40c@chromium.org>
Reviewed-by: Daniel Verkamp <72bc170b46ec491f7bdd4359a1c0bfed274de40c@chromium.org>
Auto-Submit: Frederick Mayle <ea3905c3051aaffd2c0d536be61ebbe5b4659ce0@google.com>

google/crosvm,google/crosvm,google/crosvm,google/crosvm