Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I498771274898732a55fb27a28fbd887ff12e36b2