tree 41984955e2634fae05f1a4391c1c197cbf010031
parent 97d140f38bff4e073b923ad8263b5c4fc5a8fac4
parent 0ef27dac218c26f44a8dca07d5d4a9311cd7e23f
author Neil Fuller <nfuller@google.com> 1531386361 -0700
committer android-build-merger <android-build-merger@google.com> 1531386361 -0700

[automerger skipped] Remove unnecessary libcore includes am: 23a97d8d46
am: 0ef27dac21  -s ours

Change-Id: I594bfa59f9ccafa19fa466ffe7a77f8d1407c742