am cbca9344: am 497c8938: Merge change I24a40dc2 into eclair

Merge commit 'cbca934496ffa7305190fafa85aac7a5c69f2fde' into eclair-mr2-plus-aosp

* commit 'cbca934496ffa7305190fafa85aac7a5c69f2fde':
  Put launcher2 back into its own process.  bug 2241963