Merge branch 'aide_native_tools_l_preview' into HEAD

Conflicts:
	liblog/Android.mk
	libutils/Android.mk
	libutils/Threads.cpp