Merge "Add resetJitCounters" am: eb4f386015
am: 617e86a6a5

Change-Id: Ib1d51d3b6df850a3e3bc42abf45b486378de858b