Merge "hwcomposer: Correct padding for 32/64-bit"