Merge "Revert "Use arm instruction set with clang 7.0 LTO"" am: 5adbc5bec4
am: 27bab41c9d

Change-Id: Ie479c9bca550283d3e146f5a243ffc81127deb9d