Merge "Move the duplicated alignment macros to a common location." into dalvik-dev