Fixed a merge of OcConnectivityType and OcConnectivityFlags

Fixed a merge of OcConnectivityType and OcConnectivityFlags
throughout the android stack

A small Android API change was introduced as part of the merge: all discovery
calls now take a Set of OcConnectivtyTypes instead of a single enum.

In addition, it fixes a setHeaderOptions bug.

Change-Id: Ib269e39a0168055b4a1f46353cbd620fbff1dbad
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1992
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>