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

Change-Id: Iec585cbe1ed97502ab0870b5088cfd6817670332