Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I3756ac113f430ea9c47af7dd0198722b25baf83c