Merge "Add AID_STATSD and AID_INCIDENTD for statsd/incidentd daemons."