Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ia0126aa448caa7ce354ee19539ab864617efc629