Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I5ead15a11fcb73cf8934be625bb53d332ce7d130