Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ida2f60315b718c2b06f5e0d1d4cd64bbceb557b2