Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I139f101109f49aca1c2da5b8a064dec57a923a74
tree: 96b9013eced0b247aeee1782e84b48c8d2ead0e2
  1. conf/
  2. include/
  3. src/
  4. Android.mk
  5. vnd_buildcfg.mk