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

Change-Id: I597426d2850ca5c8bf315c3989b42828dd016b49


Trivial merge