Merge "Revert "Look for the resolver library in /system/apex as well as /apex."" into qt-dev
am: 8f6f89ccd3

Change-Id: Id954f8a85a87cf4c37fd481d121836db5f60397b