Merge "Remove libcore/io members from light grey list" am: 2579dcd17e
am: 1e69440dff

Change-Id: I293723f450b71c12369dc97ea261e0f0a08e2b63