m8: Clean up sdcard services

Change-Id: I64bf62387f21a88a93a457c56b267ede0948b50b