Merge commit 'Merge bionic optimizations' into kitkat

Conflicts:
	libm/Android.mk