Merge changes from topic "header-checker-weak-symbols" into qt-dev
am: 146dd7045d

Change-Id: Iaa050edaf55ce17cfa9fd56b630dfcdc7618925a