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