Merge "Remove unused *_tmpfs types"
am: 586c2cdfdf

Change-Id: I575c948a9143a3d3926ef4bb8b758eab6c928c32