Merge "Change dump-classes profman option to dump-classes-and-methods" am: 903b8169 am: 925f067c am: 44174c52 am: 81947e18 Change-Id: I0fd40719eee08b1511ac94ace62c24cefff0cb3d