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

Change-Id: I7e9a8ae82161687e6ed385dcea3b7dd968a98ff8