Merge tag 'android-5.1.0_r1' into merge-5.1

Android 5.1.0 release 1

Conflicts:
	init.mako.rc

Change-Id: I84783179668959e7445c7cabaa16ded0b73710ff