[automerger skipped] Merge "Don't give up when loader.findLibrary() fails"
am: 082f58f2e0 -s ours
am skip reason: change_id Ia2525e736f91460a50f2def3d6a04bf3cf8c221d with SHA1 bcbc21d579 is in history

Change-Id: Ia4ab12487025527a670406f608c1981d257ccbfb