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

Change-Id: I0fd40719eee08b1511ac94ace62c24cefff0cb3d