Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I684153edd08550fb2745176746098789472babc7