Merge "Fix PDK dupbuild issues"