Merge changes from topic "am-af05f78cfd7b4d5c8dcdfec44131b806"

* changes:
  [automerger skipped] Merge "Convert statsd and incidentd to Android.bp" am: d7fa414834 am: e869320b3f am: 1c5eb90308  -s ours
  [automerger skipped] Merge "Convert statsd and incidentd to Android.bp" am: d7fa414834 am: 63e7273500  -s ours
  [automerger skipped] Convert statsd and incidentd to Android.bp am: 05c9e5c24a am: bd26d4363f  -s ours