[automerger skipped] Merge changes from topic "header-checker-weak-symbols" into qt-dev
am: 146dd7045d -s ours
am skip reason: change_id I1fbd76c93991a2b36121a5f4397c62eb72d486ec with SHA1 a2ea9eb478 is in history

Change-Id: I62dba2c0f3e2bc0c5902bd61ddd8fa8505dff3d2