Merge "Convert statsd and incidentd to Android.bp"