Merge "FileSystemPermissionTest: allow /dev/hw_random" into jb-mr2-dev