Merge "Restore ephemeral app access to /dev/ashmem"