Merge "Update bug for cleaning up swcodec dependencies." am: d1e17720ad am: 856b770414 am: 138be378d1 am: ec64c1def9 am: f18a17ad3a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1412307

Change-Id: I77be65d7cf5d57f07c956ac390a013000e165e7c