Merge "Convert statsd and incidentd to Android.bp"
am: d7fa414834

Change-Id: I5e55ddd99e09dc53ce6e5d71a7e93c40b03f1cd2