Merge tag 'android-5.1.0_r1' into HEAD

Android 5.1.0 release 1

Conflicts:
	CleanSpec.mk
	core/Makefile
	core/build_id.mk
	core/version_defaults.mk
Change-Id: Iac8a943c8115fdc13613aa796c239a7bccd2f7b6