Merge "Revert "Treble-ize tmpfs access"" am: 70a4176adc
am: ccc6412135

Change-Id: I5ef67d766bc3cbc2e8bf905fd3b21d8ad7393015