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

Change-Id: Iba1c5752405c174858df45c16bd3760163523444