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

Change-Id: Idd252a692cc05137f8d590b9b5f14759faff06a4