Merge "Fix warnings hidden by -isystem" am: 1d89f8da18 am: 6df5cd0493 am: 5e72bfe2a7  -s ours
am: 95c9953576

Change-Id: I53dd2b7cae94c756d66694e04ff0b985922cf53c