Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I4aa16709c0edf00353e2e6f011d04f2cf848f5bb
tree: e0195c43e82742041304c5b4e8b8efbe2592e87d
  1. include/
  2. src/
  3. Android.mk
  4. NOTICE