Merge branch 'upstream' into tizen-merged

Merge branch 'upstream' into tizen-merged

Conflicts:
	meta-tizen-common-base/recipes-application-framework/capi-base-common/capi-base-common.inc
	meta-tizen-common-base/recipes-application-framework/vconf-buxton/vconf-buxton.inc
	meta-tizen-common-base/recipes-applications/libslp-location/libslp-location.inc
	meta-tizen-common-base/recipes-applications/libslp-memo/libslp-memo.inc
	meta-tizen-common-base/recipes-core/oma-ds-agent/oma-ds-agent.inc
	meta-tizen-common-base/recipes-core/sync-agent/sync-agent.inc
	meta-tizen-common-base/recipes-core/tlm/tlm_git.bb
	meta-tizen-common-base/recipes-graphics/libdrm/libdrm.inc
	meta-tizen-common-base/recipes-multimedia/libmedia-service/libmedia-service.inc
	meta-tizen-common-base/recipes-multimedia/libmm-log/libmm-log.inc
	meta-tizen-common-base/recipes-security/gpg2/gpg2.inc
	meta-tizen-common-base/recipes-social/contacts-service/contacts-service.inc
	meta-tizen-common-demo/recipes-graphics/weston-common/weston-common.inc

Conflicts were caused by make invocation: we replaced -j16, while upstream
make invocations varied between older and current spec2yocto run. The reason
for that partly seems to be that we lost patches replacing plain "make"
invocations with "%_make". The result is that the converted recipe has
"make" instead of "oe_runmake".

If that matters, then we should do another round of patching of the generated
.inc files, because getting more changes into place in Tizen is hard at the
moment.

Change-Id: I6f510814ba88b19a03b7aa1a60587219c04638fe