Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Iffcb1eec0f1d69c6fd990bf97fcfed008dfcd8b4