Merge "Stop including libcore/include/ in frameworks/av."