Cleanup ComputePerf for API 21

bug 16406835

Change-Id: I2bcac7b0e3978c04d854aa0a0d1a8367c7a3c6aa
3 files changed