Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ie4e99d75619990884aec77e04107ed185b8f69a6