Merge "Fix HPROF DDMS."
am: b1c724cc1e

Change-Id: Iae24758b1516721068525405e51d00f76386d8e1