Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I119088863c5490f1c343d3d08729d425aebe70c1
tree: 1de01efab8dc3c9ec5026fa93cfe3d60d0d5d217
  1. include/
  2. libs/
  3. sample/