Merge "Framework: Ensure important fdsan function is compiled" am: afd30193a2 am: 2e657316c4
am: 9bf4ce737b

Change-Id: I66ad80be0c5c1894cf78f8d5e20109a5398f3cf4