Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I0ce748699fb5a8c01cac081b1027138e81a3efd5