Merge "Refactor lockAndWriteDma to support goldfish-addess-space"