doc: Fix spelling error in macro tutorial
add Option methods for swap_unwrap and map_consume
add Option map_consume_default method
avoid unwrap in Option::map_consume implementation
Inlining methods/functions in core.

Also inlining some functions which take functions as arguments.
add Option methods for in-place mutation
Merge pull request #4460 from pkgw/pr-tut-typo

doc: Fix spelling error in macro tutorial
Merge pull request #4467 from gifnksm/inlining-core

Inlining methods/functions in core.
Merge pull request #4465 from thestinger/option

improvements to option module
Update libuv for Android
Support ARM and Android

Conflicts:
	src/libcore/os.rs
	src/librustc/back/link.rs
	src/librustc/driver/driver.rs
	src/librustc/metadata/loader.rs
	src/librustc/middle/trans/base.rs
More android support
Conflicts:
	Makefile.in
	cmakeFiles/rustllvm.cmake
Add FIXME's for #4404. Android JNI hacks
Win32 build fix