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

Change-Id: I30516f06510106bbea240026892518816f72e828