Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ifdcfa13ad852e4474520218ff592e2702421c42a
tree: f0e1d5275caf3ebd098a825399eff4964e3c421c
  1. bin/
  2. lib/
  3. update.sh