Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I3fda4b5b4da3d6e9d1f84e96fa12a10c18492fd9