Merge "Add a suite tag to ahat unit tests"
am: adc4057115

Change-Id: I78db072b08a2e7088902c31d5bc21a3f3f77e342