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

Change-Id: I2dfd59f1aa60054554912c599d96319a6b4e615a


Trivial merge