Merge "MediaCas: move clear key plugin to /system/lib" into oc-dev