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

Change-Id: Iab18593f0c15512d1c575d2780ef5dbf4e131d24


Trivial merge