Fix build for arm-linux-androideabi-4.9 and update aarch64-linux-android-4.9

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>
Merge remote-tracking branch 'sm/master'

Conflicts:
	arm-androideabi-4.9