Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id6c3355c3d74776151c2709284c211932ce642e3
tree: 383bfb90e1940881c4f125f4b595ef1d2ad44e5a
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml