Merge "ART: Relayout ProfilingInfo" am: 041d577bdd
am: c3081aaa99

Change-Id: I526d41b1b1c6b564025698b44120131c17299ca6