Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev
am: f7d3e028ae

Change-Id: I61692ebdc49233923863ce773bb42a07498551b0