Merge "Remove unnecessary shared_libs for resolv APEX" am: 74517fccd7
am: ad1fca9de7

Change-Id: I7a8d5376af2a506d7eb37dfb7c0591a975f0a073