update toolkit build and platform submodule
merged upstream