Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ifdc71605dac6141095a04105ea01c5fe1640becc