Merge "Stop using FDE-related constants from IVold"