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

Change-Id: I3ca77f508f5ae8c94053757b1265cd348e51f169