Backport r201789 and r201824 from trunk to fix ICE. Google internal bug: 11349792.
tree3457be52c201879d699ea33b1b1949cbb2020475
drwxr-xr-x - gcc-4_6-mobile-vtable-security
drwxr-xr-x - gcc-4_6-mobile
drwxr-xr-x - gcc-4_6
drwxr-xr-x - gcc-4_6_2-mobile
drwxr-xr-x - gcc-4_6_3-mobile
drwxr-xr-x - gcc-4_7-integration
drwxr-xr-x - gcc-4_7-mobile-vtable-verification
drwxr-xr-x - gcc-4_7-mobile
drwxr-xr-x - gcc-4_7
drwxr-xr-x - gcc-4_8
drwxr-xr-x - integration
drwxr-xr-x - main