Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I7dca0b40bc7aa72cbf15f3a7d87e4aa879a661a2