Revert "build:  Add USE_SET_METADATA tag"

This reverts commit e6dd009c919c5b33cf04c9a5ef09cf19ae541728.

Conflicts:

	core/Makefile
Revert "build:  Add USE_SET_METADATA tag"

This reverts commit e6dd009c919c5b33cf04c9a5ef09cf19ae541728.

Conflicts:

	core/Makefile
Merge branch 'cm-11.0' of https://github.com/temasek/android_build into cm-11.0