Merge "Layout clinit code items of profiled methods together." am: 83b14047 am: 1cfde07f am: 85fce79e am: d2cf4fab Change-Id: Ie36a24640fb7226f430dd9bde784c2c687d2e3d1