Merge "Flip default of extractNativeLibs if targets Q+"