[automerger skipped] DO NOT MERGE
am: d3fb2be4cc  -s ours

Change-Id: I344e07ee7d6c26377abf5780b44016b8ea112d27
tree: e956bb15597fdabf960c75d1ff27b87f155b4207
  1. BoardConfigCommon.mk
  2. kernel-headers/
  3. msm8x09.mk
  4. original-kernel-headers/