Merge "Change dump-classes profman option to dump-classes-and-methods" into oc-dev am: 5696bf8016
am: c168891556

Change-Id: I17a1eaac8c6435fdbad3ed58a3884d3f3b587fa0