Merge "Don't build ahat tests with EMMA_INSTRUMENT."
am: 01682113de

Change-Id: I201ec8b0117c4b35a3ca6305a1d4fab9fbadc2ce