Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I49756823dfe8328785fac25223b706a7e9577cd7