Merge change 6375

* changes:
  Fix build on some linux distros.
tree: 66be076ec2c51b1395084e5ff7cc4d7cd5b1358b
  1. include/
  2. modules/
  3. Android.mk
  4. hardware.c
  5. MODULE_LICENSE_APACHE2
  6. NOTICE