Merge "Unify DrawProfiler/JankStats" into mnc-dev