Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ifcd2a6ecae3df1584400bb1472a54f4d272922fa