am 307fbbf2: am 49fa9e00: Merge change Ibf6e51b7 into eclair

Merge commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1' into eclair-mr2-plus-aosp

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