The original changes are 4e54b521 and 12dd9cd4. Test: atest CtsDynamicLinkerTestCases Bug: 124353586 Bug: 112037137 Bug: 128335904 Change-Id: Ie55bc735aebcf33d1561b5c225a8bac8d68e85e2