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

* commit '0c9c0bfcc6f2d10fa7235f48b0174a1a120ca599':
  Include $(BUILD_COPY_HEADERS) in upper-level makefiles