Dirty hack for latest CM updates, mostly for camera support in system/media