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

* commit '5180ed141db0f1acced4f19f37391572bc18280b':
  Instrument views inflation in systrace