am: 9643d9ce * commit '9643d9ce': Add #ifndef checks for macros Clean up version test Change-Id: I9334a2818f8351269127316fd2c0e401cf88e74c