Merge "Use arm instruction set with clang 7.0 LTO" am: 73e8025d70 am: 9eaa1049b2
am: e437eac50f  -s ours

Change-Id: Ieb0b42956e3a1ced9257d1087b7171e6b565267e