Merge commit 'goog/master' into merge_master
tree: c8f235e376a7ee701160a9b6bf33b307b96367ee
  1. include/
  2. modules/
  3. Android.mk
  4. hardware.c
  5. MODULE_LICENSE_APACHE2
  6. NOTICE