Make script suitable for vogar use on device.

Also update device expectations that need investigation.

Change-Id: I86a613f3f62c2f999296f8b7505646a96ab4adf8
2 files changed