Merge "Fix mounting /sdcard under recovery."