Merge "Convert incident_report and incident-section-gen to Android.bp" am: d928842ab6
am: 24041fe213

Change-Id: I0c179c30edf843c0e5bdb0eb267999f3ada39387