am 6a7e539c: am 22ba86ee: Merge "Add extra regression tests for an already-fixed dynamic linker bug."

* commit '6a7e539cf1d8ee49fc2b6a11d043ce7962aa2de4':
  Add extra regression tests for an already-fixed dynamic linker bug.