Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: If12eb8977f8c5a54aef86df668d40da191460dd9