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

Change-Id: I4c35c41f1c490a4716dd27388cf19e35e195ccb9