[automerger skipped] Merge "Convert statsd and incidentd to Android.bp" am: d7fa414834
am: 63e7273500  -s ours

Change-Id: I5f36e5c3a807b22548accbbbdb5646767c903577