Merge "Normalize the 2nd CPU architect of 64 bits arm GSI"
am: 469aafe421

Change-Id: Ie699b5c68229b5dec683125976ffec3f6adbb55f