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

Change-Id: I6d71b74ffb28cf564a9f21a9dd5d749f76d83210