Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I94f8048db8002094d395fa929678b048267c7c8b