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

Change-Id: Ic8ca64ec962c6fc4d78d0d628a740ce69c8a0e29


Trivial merge