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 am: ec64c1de

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

Change-Id: I91eeb71620c4b82c2a82a9be3acb2a2af47902f3