Merge "Give even better error messages on failure to launch ahat."
am: 6783118d2a

Change-Id: I3008053eeea092f6f658cd2b61fa0f9442485c01