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

Change-Id: I2e560d3a21eb77b970e5589462caf3d989b32d01