4.9 Toolchain Patch

Conflicts:
	lib/blkid/Android.mk

Change-Id: I52f717e484a412a1439e131574ccc265a38868de