Merge "DO NOT MERGE Final Revert "carp: copy smelt vendor config"" into mnc-dr1.5-dev am: c5ebfa9231
am: a1ec6c3683  -s ours

* commit 'a1ec6c3683c8dcc2ffd88d8e987f3adb882edeac':
  DO NOT MERGE Final Revert "carp: copy smelt vendor config"
tree: beccf4df6f5aaa31d36af8f2d2d19ac50fe3fd75
  1. conf/
  2. include/
  3. src/
  4. Android.mk
  5. gen-buildcfg.sh
  6. vnd_buildcfg.mk