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

Change-Id: I1ba6fddff65831493a62d182bfeb7184c6b515be