Merge "Convert incident_report and incident-section-gen to Android.bp" am: d928842ab6 am: 24041fe213 am: 950eeb20c2  -s ours
am: 4086d3f7de

Change-Id: I1ee321d69848e701899a8e1c024586009e764715