Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Iafd3142f4f267b9b6db9373f084b5b578b56409c