Merge "Build support for 32-bit armv8-a" am: 52ecb76af4
am: d9ead8a8b9

Change-Id: Ibbcb666dd36dedd36942e19ce4f95b8f4be00da1