Merge "Remove unnecessary shared_libs for resolv APEX"