Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I139f101109f49aca1c2da5b8a064dec57a923a74