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

Change-Id: I00d4a7f30763093bf5edb69bdbf5cebe57f5a2c6