Merge "Allow dlopen("/system/lib/<soname>") for pre-Q" am: 9c48951a7d
am: 16092f3726

Change-Id: I5181d8d60c59b8614c91418eb6302880b52043ca