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

Change-Id: I25d807199ae1bf19a432769b83527a16ce79fc72