Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id618d136ddb2f5e3a2cb2dc0aaba94b75ca34064