Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I28c182b4e2fbb37984fab0fb68de0a72dd485405