Merge "Remove test for system libs in system paths." am: 2f68aa8dbf
am: 2cd375dddd

Change-Id: Id86b1c7c054585bcd65618fe1702a9c9c1a49bcc