[CB-4110] remove dupe code
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera

Conflicts:
	plugin.xml
Add symbol paths for CameraPopoverOptions and CameraPopoverHandle
[CB-4131] Use relative require paths in camera files.