Merge remote-tracking branch 'omni/android-4.4' into mackay-cm11_new

Conflicts:
	mtp/MtpStorage.cpp
	twrp-functions.cpp

Change-Id: I6a650502a2d00f0848691325d552d8755d4fcdb7