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

Change-Id: Iebf581676394db8614036086954b9fa432566acb


Trivial merge