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

Change-Id: Ia0d0e00e65e311a755c1db4351c15864e4d50ba6