Remove few preprocessor corner cases affected by spec bug am: 8ecdff5
authorPyry Haulos <phaulos@google.com>
Tue, 12 Apr 2016 22:24:59 +0000 (22:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Apr 2016 22:24:59 +0000 (22:24 +0000)
am: 548dd89

* commit '548dd8998d85971746ec83358d3085c58b438ea8':
  Remove few preprocessor corner cases affected by spec bug

Change-Id: Ia6e2c7f55027fbc59d8fb3cf358f75506f506095


Trivial merge