Merge "libhwcomposer: Enable padding round for SMP failure"