Merge "Partial revert to not flip the default of extractNativeLibs"