Merged r182417 from branches/google/gcc-4_6. (issue 5491078)

[jingyu@google.com]

On 2011/12/19 22:09:18, asharif1 wrote:
> This merges xur's patch to our mobile release branch. LGTM and I will
submit it.

OK

http://codereview.appspot.com/5491078/