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

Change-Id: I40f8a8ab3532ae3dbf8324c116e2e1226ab26780