Merge "Output system_dlkm.img to dist folder" am: 2a8587c729 am: 25985f1fc2 am: ec4e699101

Original change: https://android-review.googlesource.com/c/platform/development/+/2019975

Change-Id: I96d4240a187d378715906da20123c62d8c9cff13