Merge "Fix warnings hidden by -isystem"
am: 1d89f8da18

Change-Id: I68cb3aaded4961ce4f5503f381a7dcc2657dbec7