Merge branch 'twrp2.5' into cm-10.1

Conflicts:
	variables.h

Change-Id: I3fae36608ad9b412c654b1efbedcca651c697404