Merge "Fix run-as which was broken in Android 4.3"