Merge "mount sdcard only on demand; fix sideload installs" into gingerbread