Merge from AOSP

Change-Id: I9aa7347dc02a7d898f571164e672daf5dd3ed22c
tree: 21ccb20fc16eebcca5a31321c69cf3ce2ecc3527
  1. jni/
  2. perftests/
  3. res/
  4. src/
  5. tests/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE