Merge "Retire goldfish_dma_lock and goldfish_dma_unlock" am: 8a7d434ec2
am: 199319a6ff

Change-Id: Icbb0fa0a0a7970a0d76d36b3df907bf80e50d16d