Merge branch 'jb-mr1.1-release' of https://android.googlesource.com/device/lge/mako into fix

Conflicts:
	BoardConfig.mk
	CleanSpec.mk
	device.mk
	overlay/frameworks/base/core/res/res/values/config.xml

Change-Id: I8d40e99fc60777f67a7afde3117969be526ab589