Merge "Fix warnings in system/extras."