Merge "Don't build ahat tests for mac."
am: e1e347dace

Change-Id: Ife99c5dede8d57c05068a898873ad3ab91c1c227