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

Change-Id: Ib199ae2a9f7a3baf1f5f07db7d5d245206d57dcc