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

Change-Id: I0e945b1490051acc1c3d1c5edfe510f008ff4b12