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

Change-Id: I306e6d0b58ed11254e332656862b9f32cd692254