Merge "Revert "Revert "Build support for 32-bit armv8-a""" am: 9a888ebb51
am: 9f55141c5f

Change-Id: Id69407d756c23a05bef58f104f547c4bf451d786