Merge "Khaje: Tune perf xml based on measured fps"