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

Change-Id: Id67206d2abe8f40943325553b6aadb2b12701240