Merge "make perf-measuring code safe across SDK levels" into qt-dev
am: f4a034c42c

Change-Id: Ibaf00601964a6b1d4cfab3e80577a2b2e1c3bf67