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

Change-Id: I93f9b2360e4bc50b9596cb02749d753ac282c3e5