Merge "Update bug for cleaning up swcodec dependencies." am: d1e17720ad am: 856b770414

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

Change-Id: I3c0ee1a4f504dea3c0ffbf013c39b5f865558f25