auto-merger: merge in from aosp/master

Conflicts:
	libc/arch-arm/arm.mk