Merge changes I6b780c1d,I238d963a,I32076c65 into main am: 51f1006440 am: dc59b8c5ce am: 15ee7e75ee am: 260ca43c05 am: 413967daf9

Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784358

Change-Id: If27eaab096fbbaed77317669e59938fcce1b611c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>