[automerger skipped] Convert statsd and incidentd to Android.bp am: 05c9e5c24a
am: bd26d4363f  -s ours

Change-Id: Ic6547743f17b160576b3087e95313e131e2f71fc