Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ibf5539a33b14aba68b8117c31dc7f2148016e018
tree: bf912f3ff26c250e130823aaf72fe2c5da2503fa
  1. 60xx/
  2. 6515/
  3. 65xx/
  4. Android.mk