tree 86b0ca466ccf9e130a0a4ab94f91b58c3abdf888
parent 9d44d9dd53bd3da3b01445a52b5d2420dc40f9b2
parent 1fe2b737ad19056bc2bc298b7c30ac93d36a4f6b
author Elliott Hughes <enh@google.com> 1465855590 +0000
committer android-build-merger <android-build-merger@google.com> 1465855590 +0000

Fix the build flags. am: f2233f4546 am: 425c5485df am: cd960ab4e9
am: 1fe2b737ad

Change-Id: I14c4bb4494b6d7eb991bed9a1b79b5f5aaa0c01e