Merge commit 'a2a01e7b3f6db152eab6f074ea4cc17c80ab52c4' * commit 'a2a01e7b3f6db152eab6f074ea4cc17c80ab52c4': Enforce 32 pixel alignment for Adreno 200