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