Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ifdc71605dac6141095a04105ea01c5fe1640becc
tree: d5006f64f76a9b03ac225ee3bae3b63e651a81e6
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml