Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Iad354104e40ec797045e8bc250815c33e24bcdb7
tree: 3f3623aef716acb4af86b8d5d4a8b9a578d59843
  1. ISV/
  2. ituxd/