Merge "Fix array out of bounds access in JankTracker" into nyc-dev am: f01e4af
am: 0775a95c

* commit '0775a95c3989bbffe39a150921a6e6209629917e':
  Fix array out of bounds access in JankTracker

Change-Id: I076f82b0011ec168d5729a1f80e8059cde71273e