Merge "sdcard: mute false compiler alarm"
am: cb4e164562

Change-Id: Iefc21ac2b479095e50a764495843db28bebdffa5