omx: restructure and cleanup include locations

Change-Id: Ibabf526b5a57c689dee959f665033ba4c789ead1
omx: board setup corrections to use omx vs domx

Change-Id: Idd94fa80c8830fd37cab3a6b63e38b525763434b
Merge remote-tracking branch 'kf/cm-10.1-k34' into cm-10.1-k34