Merge "Include ahat in the general-tests tradefed suite."
am: 4536a234e5

Change-Id: I167eb3441af7673aee5b07dcd6a2a46d0f4c6121