Merge "qseecom: Add macros for aligning data"