json & expat: Update component.mk after merging from master

components/expat/Makefile → components/expat/component.mk

@@ -12,4 +12,4 @@ COMPONENT_SRCDIRS := library port
 
 CFLAGS += -Wno-error=address -Waddress -DHAVE_EXPAT_CONFIG_H
 
-include $(IDF_PATH)/make/component.mk
+include $(IDF_PATH)/make/component_common.mk

components/json/Makefile → components/json/component.mk

@@ -10,4 +10,4 @@ COMPONENT_ADD_INCLUDEDIRS := include port/include
 
 COMPONENT_SRCDIRS := library port
 
-include $(IDF_PATH)/make/component.mk
+include $(IDF_PATH)/make/component_common.mk