Merge changes I9eba2e34,Iab2a2a2f into integration

* changes:
  refactor(cpus): replace adr with adr_l
  refactor(build): introduce adr_l macro