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

Change-Id: Ia44c41044af5852eb6bb303e8573aeb9e6b9c87e