Merge "Retire goldfish_dma_lock and goldfish_dma_unlock"