Merge "ARM: VIXL32: Fix "Align allocation entrypoints.."."
am: 1a991dbf85

Change-Id: I6734e1b3f1150072b843cc561ea277ac582d175f