Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Idf927a4af60bf9f14fdf4b017add997a6541e4ce