Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Idec2563729c5cbe15643c9a6b6cb07685db19bb6