loki: update to latest code from djrbliss (v1.9)

Change-Id: Ic3087935be45becb82990ae140fd949ac3284f41
jflte: loki: support flashing loki'd recovery images

Change-Id: Ib2caad1a6b7aa048be9abf8f3503aabf50fa134f
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	device.mk

Change-Id: I12ba9e2ec51c167fc5eaa367518e7c2b7e995511