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

Change-Id: I6e90afed40653af01c602b37f03f741fe8f35e39