Merge "Debug: Remove obsolete InstructionCount code." am: f5a8edeaf0 am: 47659c3351
am: 39343bf215

Change-Id: I79f3b2ec2a2ef449703867dea4dced63ab1b63ad