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

Change-Id: I751944e050b849e18c78857f64134ba54d0978eb