Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I8e3039058400164c2d1152d72a310c936396037f