Fix merge derp: Emulated storage should be mounted in the child, not the
parent.

Change-Id: I7bb6e8db1a64de90e96783e07ff26932befe2742
Fix bugreport toast spam.

Change-Id: If6886089aa132694b6aad0a4d3d35646bffbed71
Merge "Fix merge derp: Emulated storage should be mounted in the child, not the parent." into cm-11.0
v1030

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

Conflicts:
	Superuser/AndroidManifest.xml

Change-Id: Ic4c9b674efb040b51a36472cabcd6234a5f382b2