supersonic: a little tree cleanup

Change-Id: I383e663917e1bb0e774a04c61be09e8f93ffec4d
supersonic: update for unified fstab

Change-Id: Ifc849598eb7b4da87636b3de005e3459c35f1c74