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

Change-Id: Ia2474df14688b5937b5aaad59aebf26af8188a6a