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

Change-Id: Ia8f87b1b2295515863d414193fcb9ba029b64f25