Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I66b86b72f38554e94db646538f2e04f1fab1d0b7