Merge "Revert "Use arm instruction set with clang 7.0 LTO"" am: 5adbc5bec4 am: 27bab41c9d
am: 51cf207805  -s ours

Change-Id: Ic58f81f1380b750460e94ec96b1a10c077720dd9