build fixes#1

vicamo wants to merge 2 commits into

merckhung:mastermerckhung/lfdk1:masterfrom

vicamo:for-upstream/build-fixsvicamo/lfdk1:for-upstream/build-fixsCopy head branch name to clipboard