Merge commit '35ede78ede13fc2c4e7d343f50ca20372a404e06' into eclair-mr2-plus-aosp * commit '35ede78ede13fc2c4e7d343f50ca20372a404e06': fix some aspects of [2258746] native crash in launcher2
Merge commit '35ede78ede13fc2c4e7d343f50ca20372a404e06' into eclair-mr2-plus-aosp * commit '35ede78ede13fc2c4e7d343f50ca20372a404e06': fix some aspects of [2258746] native crash in launcher2