Merge "Fix the bug that goldfish cannot be launched with local system and kernel" am: e5ed390566

Original change: https://android-review.googlesource.com/c/platform/tools/acloud/+/1839556

Change-Id: Ie028fcd8500f733ebf460c1201f9cb46790e5813