vendor/slim: cleanup for marshmallow

Change-Id: I639b2745933119786940d18e860760bafee1cc54
6 files changed