Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I47b3abfa47007d12bb276f368634b6482a149fff