Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: If4f3546a90a74c041bd498d0fe6ea37571623fe2