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

Change-Id: Ie79d59b5366eec9681e852e6e4f9cd69eddbaba0


Trivial merge