Merge "Fix sdcard mount flag for goldfish device"