Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk

# Conflicts:
#	platform/app/builder/Z3GatewayHost/Makefile
#	platform/app/builder/Z3GatewayHost/rpc_api/inc/rpc_interface_parse.h
#	platform/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c
#	platform/protocol/zigbee/app/framework/util/af-main-host.c