Merge remote-tracking branch 'sm/wip'

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>

Conflicts:
	Makefile.in
	arm-androideabi-4.10
	arm-androideabi-4.8
	arm-androideabi-4.9
	arm-eabi-4.10
	arm-eabi-4.8
	arm-eabi-4.9
	saber-host-linux