Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I802e6747555b310a6dff8d6461447d83cabed1bf