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

Change-Id: I5290b5d51dd98eecaa97c87eec1dc8780d1f537a