Removed <oic-resource>/csdk/android and <oic-resoruce>/csdk/controller plus <oic...