Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ica49bad80ca239d82933b7f0843d824724e514b1