Merge "Skip SD card tests on devices without SD cards" into honeycomb