Merge "Remove unnecessary warning flags, now that the warnings are fixed."
am: e3fd73e1c8

Change-Id: Idbbb125e5b57d4697619561a72205ed70afd75ed