Updates for CM12

Signed-off-by: DHOMD <DHO@dho.im>

Conflicts:
	config/common.mk
	proprietary/common/bin/backuptool.functions
	proprietary/common/bin/backuptool.sh

Change-Id: I6758f2820126e47d5860c142bd79ba618bd2e241