Merge "Retire goldfish_dma_lock and goldfish_dma_unlock"
am: 8a7d434ec2

Change-Id: I0cf94a40d006f916eb820ac344f8938ee5e56db5