Merge "Framework: Ensure important fdsan function is compiled"