Merge "add #ifdef to every header"
am: 66fa0e4a50

Change-Id: I31af13239b72d18c4dc4f42c0992d843eb1c2c67