Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I9588dab538d484ea5843f0a156139e57f6113199
tree: f5f2cf38e2475ee7ef8ae40a7a0144d7856e0418
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml