Merge tag 'android-4.4_r1' into HEAD

Android 4.4 Release 1.0

Conflicts:
	lib/Driver/Tools.cpp

Change-Id: Ia9c4704937a9fe49ecc14919ff0b5889f479e5f1