Merge "Export TARGET_PREFER_32_BIT_EXECUTABLES to soong" am: fe3163400e
am: a7553ae1ce

Change-Id: I0fe9b722531df9e9ee1367605e418d91b986f3ba