Merge "Give better error messages on failure to launch ahat."
am: cdf68b16a2

Change-Id: Id6cf20b8483285fc75f7abdd103e28406ac73e99