Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id5a5110ed14672cd06b283267f8d35c0e085149f