am f7f3955d: am 5f395624: am aed27f80: am b0739c66: Fix run-as which was broken in Android 4.3

* commit 'f7f3955d4d7cf78914395ddb47400d1237bf4bc2':
  Fix run-as which was broken in Android 4.3