Merge "Rename fsi_boot to dex_boot and the flag names"