Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ie036d2d351eb2bab12d275657aafd637fc302df6