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

Change-Id: Idde5f612c4a4acd34ef5f3a6721451299e31a13d