Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I8d034016178c593a99e6d8a08c38a51622b700e6