Fix bugreport toast spam.

Change-Id: If6886089aa132694b6aad0a4d3d35646bffbed71
1029

Change-Id: I0cd3dde3c1c06c7fa50ac6adc2ba9e49eb70a663
Merge remote-tracking branch 'koush/master' into cm-11.0

Conflicts:
	Superuser/AndroidManifest.xml

Change-Id: Ic4c9b674efb040b51a36472cabcd6234a5f382b2