Merge "Fix test scripts to account for new linker behavior"
am: a0637543dc

Change-Id: Ia2e19fc856660da848bb1dca01125eea07f72cd4