Merge "Revert "arm64: Remove unused macros from assembler.h"" into msm-4.8