am 49fa9e00: Merge change Ibf6e51b7 into eclair

Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-plus-aosp

* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
  Set argv[0] from the main thread of an app, not a random binder thread