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

Change-Id: I270597de682a54aa775200f71e1460a3f0bd7f98