Merge "Align ARM Neon blocks to 16 bytes"
am: bf1f16488d

Change-Id: I530f8be5227b841494f192133afad0d9f6fbc625