Merge "Enable fdtrack in system_server." am: 62d4abfd06 am: 7a3ca3763b

Change-Id: I8f0916438cdf5b762a25621bbc8809a5cba6f4bb