Fix the build flags.
am: f2233f4546

Change-Id: I994fd18a84073d6f3d928141e032839abde43dcb