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

Change-Id: Id50f503044727695c58420ae83393918d7f720e1