Merge "Change dump-classes profman option to dump-classes-and-methods"
am: 903b816907

Change-Id: I6d64029327791cd3d62206b0dcfbc141b382c2a5