Merge "Move FramestatsTestApp to apps/"