Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Iac0ab0e30d9cfdfc000757eb2bee30e0cc90d431