Merge "Mark perftests directory as a test directory."
am: 8ff3f0e77d

Change-Id: I5f83fffb97b3c98f3ce6ffb7e89f320d6afaa988