Merge "Refactor lockAndWriteDma to support goldfish-addess-space"
am: 5a181df254

Change-Id: I825df7ebf3bc3b948c9dd945e6a26af51c0af6ba