Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I0eca19ee2680183a7f393eac4bb7e109518cfe08
tree: 589a357353e35e60ed08aed1f65d0f6e0d33bf8d
  1. client/
  2. include/
  3. server/