Merge "Framework: Ensure important fdsan function is compiled"
am: afd30193a2

Change-Id: Ic22f8e0b5202b76478a0d9175a2c4a750e788292