Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I599b263607546e7f0e5feeffdbb2e2a74ef08a43