Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I25ec021740f0abf983b100fda6ae6c73e5f7628a