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

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