Merge branch 'security-summit' into 'master'

Merge branch 'security-summit' into 'master'

* security-summit:
  Added AMS functionality to support on-demand ACL provisioning.
  Added Android support for Provisioning APIs
  Quick fix on getting secure port information

Conflicts:
	android/android_api/base/jni/JniOcStack.cpp
	android/examples/settings.gradle
	resource/csdk/security/include/internal/secureresourcemanager.h
	resource/csdk/security/src/secureresourcemanager.c

Change-Id: I57d1157e4c1e74425fe27757e7dfa8a4ef8d427a
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>