Fix Android builds compiler flags am: e2af5c745d am: 7755688536
authorMika Isojrvi <misojarvi@google.com>
Wed, 8 Feb 2017 18:34:03 +0000 (18:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Feb 2017 18:34:03 +0000 (18:34 +0000)
am: c5a0adfad3

Change-Id: Id9c6c155f6b0b186004780742d3b9fcdb4b1df20


Trivial merge