Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I5017e17362a2838d0e89955cb984ee361a7ecb58
tree: ecc6497c401befd1e82845564a0111d06fdaac00
  1. JustForUs/