Merge "Revert "Allow dlopen("/system/lib/<soname>") for pre-Q"" am: 73ee7a6320
am: 482e14e159

Change-Id: I1b0c485c27bf2a5576f7f99eac7ce05eb0c9026c