Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Iabd5d9f472e0336bff5f6065a40429ebd7e98721
tree: f91c3f0f34607139911d8db8c9e05b6d61b053e0
  1. java/
  2. MODULE_LICENSE_APACHE2
  3. NOTICE
  4. README.android