Merge "Fix handling of globals for new linker."
am: 8ddded2f96

Change-Id: I3b9acbd1a75daacc5e861937b6ad5a212d34a783