Remove alignment and copy size patch

Applied in androidarmv6 repo