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

Change-Id: I7792d474064696ce24dfca47823c73aab79c59f3