Small cleanup on slim.mk

Change-Id: I77d9ec1794a7f1c05a7be59e04adee43f909f660
Merge "Small cleanup on slim.mk" into jb4.2