Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I3b85f4b54b50c1d08106a71869b8ac14f4d8107f