Merge from open-source master

Change-Id: I61c25b1a833960ec83f0f92b7bf775c767f00f45
tree: c8ffa08f80bee9197067581b35a049d4164225f6
  1. src/
  2. Android.mk
  3. AndroidManifest.xml
  4. MODULE_LICENSE_APACHE2
  5. NOTICE