Merge "Stop including libcore/include/ in frameworks/av."
am: adc9ba6520

Change-Id: I85d3504c3e749ce192103e19fc3102fc99dee1c0