Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I74440e1db5ecfc0c63d0dde16112a4206bd55993