Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I18ac459ad4577f403f3418493185b707e3880965