Merge "Merge "add media.swcodec to native watchdog" into qt-dev am: a37cd55e" into qt-dev-plus-aosp am: c474bb22 Change-Id: I06de068d58af72a51be8eb0d0a4937530d5033f7