Merge "Remove unnecessary libcore includes" am: 0e8d654f7d
am: e85263ca59

Change-Id: I727d63c41ce1050e23f89aef74d00a6bd4dffbd1