Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev
am: 4f179bb174

Change-Id: Ic8177c57829e8f28b881c3347b1a4b93084c7fe4