merged in ICS_AUDIO_BLOB ifdefs from CyanogenMod
Added DISABLE_HW_ID_MATCH_CHECK #ifdef so we can use camera wrapper
Merge remote-tracking branch 'upstream/master' into HEAD