Merge "Change dump-classes profman option to dump-classes-and-methods"