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

Change-Id: Iaf5158ff00eac7f4aff21eb7c3c31d62ec92ee33