Merge "Fix warnings in system/ headers" am: d7f60fd871 am: 299df0bf01 am: 88fd7e2ec4
am: bd45ba6972

Change-Id: I3f643d2586ca0fa2eec0411f5995eca74308775c