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

Change-Id: Ic3087935be45becb82990ae140fd949ac3284f41
Merge "loki: update to latest code from djrbliss (v1.9)" into kitkat