Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I1da51b38def6ab0872cf45221b2e4c1073504e0e