Merge "Revert "Workaround for GCC aarch64 compiler bug"" am: 516ebfdd41 am: 9c717a588...
authorPyry Haulos <phaulos@google.com>
Thu, 19 Jan 2017 23:36:51 +0000 (23:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 23:36:51 +0000 (23:36 +0000)
am: 7ef10bcc65

Change-Id: Id9a48c7893d3dfa297dd046d9d825c97c1226359


Trivial merge