am 9aadde67: Merge "Include  in upper-level makefiles"

* commit '9aadde673481043f650a420a104dde21a4c13f57':
  Include $(BUILD_COPY_HEADERS) in upper-level makefiles