Merge "Allow /dev/dma_heap directory to be readable"