Merge "Make servicemanager.microdroid uninstallable"