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

Change-Id: I68cd26b975c2e40ffd0bd718d1a7f5dc58a4f1a0