Fixes after merge

    * Fix compile error due to missing { after label in switch statement
    * Update BoardConfig.mk to change the case of sdcard in primary/secondary storage labels