Merge change 7784

* changes:
  Remove redundant defines, these were only necessary while changes were being staged to another repo
tree: 424815afa4d926475ea6963db97ad97c9a080184
  1. include/
  2. modules/
  3. Android.mk
  4. hardware.c
  5. MODULE_LICENSE_APACHE2
  6. NOTICE