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

Change-Id: Ie4312be185ec1c6b828960345b23b8eafea75312