am 4d0bf120: Merge change I08c19bee into eclair

Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-plus-aosp

* commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe':
  DO NOT MERGE: Another gcc 4.0.3 workaround.