Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id25e58facce91bd9c22ba5e6658db8ba93ac51c0
tree: 648b1d3d905516553b8a4d7062ab5a96d317d54b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml