Merge "AUtils.h: Removed unused variable macro usage" am: 190607bd55 am: 2d1ebfdcb7

Change-Id: Ib81657b45d4a5c2936d1e2c12c0381d0b9bbc691