Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id8808a237674627321a87b925ed86699fdfdea30
tree: 99d284a5f525ce729615f3fe422182b53638dffe
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml