Squash 4.3 changes.

Conflicts:
	ext4_utils/make_ext4fs.c
	ext4_utils/mkuserimg.sh
	micro_bench/micro_bench.cpp
	su/su.c

Change-Id: Ib0977fd87dcf0336af80c5e6bf932baf5f771693