Merge "Add servicemanager.microdroid"