Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I32c6eba2d67878b11233810be44b180e49737457