Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: If02b100e7f22a1f1dd198fa50a6ee61ae3747bc7