Fixup armv8-a building, and make multiarch builds work

Change-Id: Ica6c855a77cb14a2c96682f6c7bf5bdae9a06970
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0