Merge "Update PackageSettingBase.usesStaticLibraries correctly." into oc-dev