Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ibbb1c6d1c760f9cb9a4a241725244eb895477e49