Fix arm64 build

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