Merge "Hadler USER_ALL when uninstalling static shared lib" into oc-dev
am: 4c25935bfe

Change-Id: I749fdd31dda412058b8ef598e1b876e0b3a24c30