Some build fixes for overlay ...
Merge branch 'jb-mr1' of github.com:ThinkingBridge/vendor_thinkingbridge into jb-mr1