Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I2761971bba85960541378f1eb603563e04d08c19