Merge "Move libcore/include to point of use"