Merge "Allow --local-system-image to be file" am: a53ee5009a

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

Change-Id: Ibde26be2c57a6741ce9cc3fe0947852d4cfc27da