Merge "Revert "Treble-ize tmpfs access""