Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ia1d80b8bc9e5a881a8d20a0c368923769f4f1408
tree: 42a62ca30b2a367112f931349fb897d06e8fc4ef
  1. icu4c/
  2. Android.mk