Merge "Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e2 am: a4604013" into qt-r1-dev-plus-aosp