Merge "Revert "Fix find_library search order."" into snap-temp-L10000000721225595