tweak, fix sd fstabs, and add releasetools/trash.txt folder to thin etxras folder in output zip

Change-Id: I29177b173fb3d66f355b4f349b4d9d1635f485fa
oops

Change-Id: Id8ff4744fecede4b132c011547b8b896217988fe