Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I1bfeb0d9aa9e441e0962baf17b8f9b28dfc206b3
tree: c1fbdd207e801fc46f417a230898a7e5d2040a5d
  1. cpp/
  2. java/
  3. testdata/
  4. codereview.settings