Merge "Fix more system/core/include warnings"
am: 18fbd80504

Change-Id: I9450a77271cdc42cc7db30461769ddb18f2e5af4