Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I9588dab538d484ea5843f0a156139e57f6113199