Slim it down a little more

Change-Id: I656a1941e5249b8db5eca5d4eced292e52f751e2
Track SM toolchain 4.8

Change-Id: Ie559410fd5027776aa3f5cb2095711bcb1bc9b64