Merge "Update bug for cleaning up swcodec dependencies." am: d1e17720 am:...

Merge "Update bug for cleaning up swcodec dependencies." am: d1e17720 am: 856b7704 am: 138be378

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

Change-Id: I7abd8c567788599a5b17016b1f24687554592077