Merge "Fix warnings in system/ headers"
am: d7f60fd871

Change-Id: I616548e002f517fe9f85b49aef9d9b6a5548127e