am aa4bc822: Merge "Update err.h to get the assembler guards."

* commit 'aa4bc822d6b3b3e39d42a387922553cf7e460994':
  Update err.h to get the assembler guards.