CB-7187 Delete unused #import of CDVShared.h
CB-7187 ios: Add explicit dependency on CoreLocation.framework
Merge remote-tracking branch 'upstream/master'