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

Change-Id: I599ed19a37aee2485b83f3a54fc565c7b680c0cf