Simplify some #if

Change-Id: I9d3239bdbb92f715b050fd91238add5588969bf0