Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

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