fix debug=2 build

Change-Id: If373905f4fd0ae4889b39b69a5dd089ccc9aff69
callcatcher: update unused code

and strip away some stuff in rsc that should now be dead

Change-Id: I6411e706c50dff299099680f1f942bf61c4e79f2