Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ib3d2c00278b1d78cfedd965e06ae41078ed033fc