Merge "Stop including libcore/include/ in most of frameworks/base." am: 05884ac869 am: 21ba3d9527 am: 924288c24d
am: c65df378c1

Change-Id: If8153fc81bc2117c664f23f0b63f7d6e6f91fd0f