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

Change-Id: I7fcc3bbffb3c50819440c0a0a6e718051ee21f50