Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I2ba98faa26a248f51ef3f67ffa376bb6f10b1ffb