am: de735023 * commit 'de735023': Add #ifndef checks for macros Clean up version test Change-Id: Ie07c5857c5dc18363cac5bcc8b22db3c538df75b
mentioned in commit ceff7ea8
mentioned in commit e3f97506