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

Change-Id: I1d2e8dce31c3349ae4576e0dccac3035c8a76a12