frameworks/av: update inclusion

Change-Id: If93a072fca53f64250b2a3fec6c14a6324daa7f3
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2