am 23886803: am 5180ed14: Merge "Instrument views inflation in systrace" into jb-mr2-dev

* commit '23886803a13f5f8f9c69fd6374ca1f732d1e513b':
  Instrument views inflation in systrace