StdLib: GCC 6 build fixes
    
    Resolve mainly 'misleading indentation', but also one 'defined but not used'
    warning when building with GCC 6 (using GCC5 profile).
    
    Contributed-under: TianoCore Contribution Agreement 1.0
    Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
    Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>