media: Better ION version compatibility

Change-Id: I2eb1887ecbe7a0000d2a16768b46004d92f18a82
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1