Merge "allow system_server to access files under /sys/kernel/ion/"