Removed duplicate code that had broken 'run-as'

Change-Id: Id3e5ecccdebb4a7c881c6af3e1f465e0168cc940
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_system_core into cm-11.0