Merge "Remove ahat-test phony target."
am: 77bb25b037

Change-Id: I3b1d63d9f3d005734cfbc8b3cb4c8ccc54e0d4d9