Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I621912bb09a09fefd692308595a081239aebec98