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

Change-Id: I4bf9db0ea3e15b3a1f559385ef8c2012fecbf509