Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I1838a84a219911e76f851875ec8300931694a420