SAL_OVERRIDE, Mac OS X fpicker redux

Change-Id: I02c234f36ed642b63a4a15ac4f865d8926fe081f