Merge "Fix a warning on namespace.media.link.default.shared_libs" into qt-dev
am: a04e48dbec

Change-Id: Ic45a521f32dfbe81da5f8f46af27024b3412ea42