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

Change-Id: I9a64529cb53f557a55d8d1acb4137ade1d38643d