Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ib89002e8fd09c63f88db060e6e7604094de2d557