Merge "NFC: Switch CHECK_INTERFACE to be a more friendly macro statement."
am: a7fa269dda

Change-Id: I865b0ed4a033d20e4018eace91a076ffcab789b2