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

Change-Id: I4f919dc0bfcb4d9ecd65c61b304c01169ba3ce8a