Merge "Don't change the behavior of findLibrary" am: 92c8a5bccd am: 3368cb3bd3
am: 40cd9b05b5

Change-Id: I939fec7438aefc55d649a78873eedb63dd2ba2a2