Merge changes from topic 'system-vendor-internal-pick'

* changes:
  gralloc: fix dependencies
  libhardware: add libaudio_system_headers
  libhardware: export system headers
  nfc.default: remove unneeded dependency