Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ic7766ff15859183e820fe5f18b50b8e4c18f46a8
tree: 114fbd18af676cd735e27e46e5efcf05637ad0a0
  1. res/
  2. sample/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. project.properties