Merge "Framework: Ensure important fdsan function is compiled" am: d5af15ee91 am: c21378ea83
am: 45564930be

Change-Id: I4250b2b874b1f4ee88dc6a4e4005ce3f9f808164