Merge "Update PackageSettingBase.usesStaticLibraries correctly." into oc-dev
am: f3bb49b02a

Change-Id: I308ef038e01003e6b035960ff7b5f5ca37c03772