USERGRID-1739: merge master of usergrid-java-sdk and usergrid-android-sdk to master of apigee-android-sdk