Merge "fix(fiptool): move juno plat_fiptool.mk" into integration