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