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

Change-Id: I88d335a531df6332d03eab8cf125531e68775c81