Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev